Restore the size info for the current row after measuring another row.

2004-10-15  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkcellview.c (gtk_cell_view_get_size_of_row): Restore
	the size info for the current row after measuring another
	row.  (#154945, William Jon McCann)

diff --git a/ChangeLog b/ChangeLog
index c763a4fd4d722487cb6bb026017ac70723a28e85..e02db09c06e7e363a184a6fe490be72847b7f9a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcellview.c (gtk_cell_view_get_size_of_row): Restore 
+       the size info for the current row after measuring another 
+       row.  (#154945, William Jon McCann)
+
 2004-10-14  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (shortcuts_remove_rows): Don't

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c763a4fd4d722487cb6bb026017ac70723a28e85..e02db09c06e7e363a184a6fe490be72847b7f9a4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2004-10-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcellview.c (gtk_cell_view_get_size_of_row): Restore 
+       the size info for the current row after measuring another 
+       row.  (#154945, William Jon McCann)
+
 2004-10-14  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (shortcuts_remove_rows): Don't

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c763a4fd4d722487cb6bb026017ac70723a28e85..e02db09c06e7e363a184a6fe490be72847b7f9a4 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+2004-10-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcellview.c (gtk_cell_view_get_size_of_row): Restore 
+       the size info for the current row after measuring another 
+       row.  (#154945, William Jon McCann)
+
 2004-10-14  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (shortcuts_remove_rows): Don't

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c763a4fd4d722487cb6bb026017ac70723a28e85..e02db09c06e7e363a184a6fe490be72847b7f9a4 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+2004-10-15  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcellview.c (gtk_cell_view_get_size_of_row): Restore 
+       the size info for the current row after measuring another 
+       row.  (#154945, William Jon McCann)
+
 2004-10-14  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtkfilechooserdefault.c (shortcuts_remove_rows): Don't

diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index dd4b747b105082c5b573fdde91a83df0590fd244..08cf897ae10b9ecc89f014730f32ea22382259da 100644 (file)
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -1055,6 +1055,9 @@ gtk_cell_view_get_size_of_row (GtkCellView    *cell_view,
   gtk_tree_row_reference_free (cell_view->priv->displayed_row);
   cell_view->priv->displayed_row = tmp;
 
+  /* restore actual size info */
+  gtk_cell_view_size_request (GTK_WIDGET (cell_view), &req);
+
   return TRUE;
 }